WASIX test revamp #6055

zebreus · 2026-01-14T16:50:30Z

Description

Copilot

Pull request overview

This PR revamps the WASIX test infrastructure by introducing a new test utility framework and comprehensive context switching tests. The changes replace the old inline test compilation approach with a more structured system using build scripts and test utilities.

Changes:

Added wasixcc_test_utils.rs providing utilities for compiling and running WASIX tests
Refactored context_switching.rs to use the new build script-based test approach
Added 19 new context switching test cases with corresponding C source files and build scripts
Updated .gitignore to exclude build artifacts while preserving source files

Reviewed changes

Copilot reviewed 57 out of 76 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
lib/wasix/tests/wasixcc_test_utils.rs	New test utility framework with compilation and execution helpers
lib/wasix/tests/context_switching.rs	Refactored to use build scripts instead of inline compilation
lib/wasix/tests/.gitignore	Updated patterns for new test structure
lib/wasix/tests/context_switching/*/build.sh	Simple build scripts for each test case
lib/wasix/tests/context_switching//.c	Comprehensive test cases for context switching scenarios

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-14T16:53:40Z

lib/wasix/tests/wasixcc_test_utils.rs

+    pub fn compile_shared_library(
+        &self,
+        sources: &[&str],
+        lib_name: &str,
+        extra_flags: &[&str],
+    ) -> Result<PathBuf, anyhow::Error> {
+        let cpp = sources
+            .iter()
+            .find(|source| {
+                PathBuf::from(source)
+                    .extension()
+                    .map_or(false, |ext| ext == "cpp" || ext == "cc")
+            })
+            .is_some();
+
+        let link_dir_flag = format!("-L{}", self.output_dir.display());
+        let mut base_flags = vec![
+            "-fwasm-exceptions",
+            "-shared",
+            "-fPIC",
+            link_dir_flag.as_str(),
+        ];
+        base_flags.extend_from_slice(extra_flags);
+
+        self.wasixcc(sources, &self.default_executable, &base_flags, &[], cpp)?;
+
+        Ok(self.default_executable.clone())


The lib_name parameter is unused. The function always outputs to self.default_executable regardless of the lib_name parameter value, which could lead to unexpected behavior where multiple shared libraries would overwrite each other.

Copilot · 2026-01-14T16:53:41Z

lib/wasix/tests/context_switching.rs

 fn test_simple_switching() {
-    test_with_wasixcc("simple_switching").unwrap();
+    let wasm_path = run_build_script(file!(), "simple_switching").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_switching_with_main() {
-    test_with_wasixcc("switching_with_main").unwrap();
+    let wasm_path = run_build_script(file!(), "switching_with_main").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_switching_to_a_deleted_context() {
-    test_with_wasixcc("switching_to_a_deleted_context").unwrap();
+    let wasm_path = run_build_script(file!(), "switching_to_a_deleted_context").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_switching_threads() {
-    test_with_wasixcc("switching_in_threads").unwrap();
+    let wasm_path = run_build_script(file!(), "switching_in_threads").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_multiple_contexts() {
-    test_with_wasixcc("multiple_contexts").unwrap();
+    let wasm_path = run_build_script(file!(), "multiple_contexts").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_error_handling() {
-    test_with_wasixcc("error_handling").unwrap();
+    let wasm_path = run_build_script(file!(), "error_handling").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_nested_switches() {
-    test_with_wasixcc("nested_switches").unwrap();
+    let wasm_path = run_build_script(file!(), "nested_switches").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_contexts_with_mutexes() {
-    test_with_wasixcc("contexts_with_mutexes").unwrap();
+    let wasm_path = run_build_script(file!(), "contexts_with_mutexes").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_contexts_with_env_vars() {
-    test_with_wasixcc("contexts_with_env_vars").unwrap();
+    let wasm_path = run_build_script(file!(), "contexts_with_env_vars").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_contexts_with_signals() {
-    test_with_wasixcc("contexts_with_signals").unwrap();
+    let wasm_path = run_build_script(file!(), "contexts_with_signals").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_contexts_with_timers() {
-    test_with_wasixcc("contexts_with_timers").unwrap();
+    let wasm_path = run_build_script(file!(), "contexts_with_timers").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_contexts_with_pipes() {
-    test_with_wasixcc("contexts_with_pipes").unwrap();
+    let wasm_path = run_build_script(file!(), "contexts_with_pipes").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_pending_file_operations() {
-    test_with_wasixcc("pending_file_operations").unwrap();
+    let wasm_path = run_build_script(file!(), "pending_file_operations").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_recursive_host_calls() {
-    test_with_wasixcc("recursive_host_calls").unwrap();
+    let wasm_path = run_build_script(file!(), "recursive_host_calls").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_malloc_during_switch() {
-    test_with_wasixcc("malloc_during_switch").unwrap();
+    let wasm_path = run_build_script(file!(), "malloc_during_switch").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_nested_host_call_switch() {
-    test_with_wasixcc("nested_host_call_switch").unwrap();
+    let wasm_path = run_build_script(file!(), "nested_host_call_switch").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_switch_to_never_resumed() {
-    test_with_wasixcc("switch_to_never_resumed").unwrap();
+    let wasm_path = run_build_script(file!(), "switch_to_never_resumed").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_three_way_recursion() {
-    test_with_wasixcc("three_way_recursion").unwrap();
+    let wasm_path = run_build_script(file!(), "three_way_recursion").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }

 #[cfg(all(unix, not(target_os = "macos")))]
 #[test]
 fn test_contexts_with_setjmp() {
-    test_with_wasixcc("contexts_with_setjmp").unwrap();
+    let wasm_path = run_build_script(file!(), "contexts_with_setjmp").unwrap();
+    let test_dir = wasm_path.parent().unwrap();
+    run_wasm(&wasm_path, test_dir).unwrap();
 }


Repetitive code pattern across all test functions. Each test function follows the exact same three-line pattern. Consider creating a helper macro or function to reduce code duplication, which would improve maintainability and reduce the chance of copy-paste errors.

Copilot · 2026-01-14T16:53:41Z

lib/wasix/tests/wasixcc_test_utils.rs

+
+impl<B: Write + Send + Debug + Unpin + 'static> CaptureFile<B> {
+    fn new(buffer: Arc<Mutex<Vec<u8>>>, file: Option<B>) -> Self {
+        Self { buffer, file: file }


Redundant field initialization. The field 'file' can be directly assigned the value without explicitly naming it again.

Copilot · 2026-01-14T16:53:42Z

lib/wasix/tests/wasixcc_test_utils.rs

+        let output = command
+            .output()
+            .expect(format!("Failed to run {tool}").as_str());


The expect message is constructed dynamically using format! but then passed as a static string reference. This should use expect with a closure or change to unwrap_or_else to avoid unnecessary allocations.

Copilot · 2026-01-14T16:53:42Z

lib/wasix/tests/wasixcc_test_utils.rs

+        let cpp = sources
+            .iter()
+            .find(|source| {
+                PathBuf::from(source)
+                    .extension()
+                    .map_or(false, |ext| ext == "cpp" || ext == "cc")
+            })
+            .is_some();


Unnecessary use of is_some() after find(). The find() method can be directly chained with is_some() more idiomatically using any().

Copilot · 2026-01-14T16:53:43Z

lib/wasix/tests/wasixcc_test_utils.rs

+        .env("WASIXCC_SYSROOT", "/home/lennart/.wasix-clang/wasix-sysroot")
+        .env("WASIXCC_COMPILER_FLAGS", "-fPIC:-fwasm-exceptions:-Wl,-L/home/lennart/.wasix-clang/wasix-sysroot/usr/local/lib/wasm32-wasi:-I/home/lennart/.wasix-clang/wasix-sysroot/usr/local/include:-Wl,-mllvm,--wasm-enable-eh:-Wl,-mllvm,--wasm-enable-sjlj:-Wl,-mllvm,--wasm-use-legacy-eh=false:-Wl,-mllvm,--exception-model=wasm")


Hardcoded absolute path to user home directory. This path '/home/lennart/.wasix-clang/wasix-sysroot' is specific to one developer's machine and will fail for other users. This should be made configurable through environment variables or removed if not needed.

Copilot · 2026-01-14T16:53:43Z

lib/wasix/tests/wasixcc_test_utils.rs

+                test_file
+                    .split('/')
+                    .next_back()
+                    .expect("The test file name can not be empty")


Error message uses 'can not' which should be 'cannot' (one word) in standard English.

lib/wasix/tests/wasixcc_test_utils.rs

zebreus added 3 commits January 14, 2026 14:13

Clean up new wasix test infrastructure

55dc322

Capture stdin and stdout of test wasm module

305cb76

Rework context_switching tests

4203d7a

Copilot AI review requested due to automatic review settings January 14, 2026 16:50

Copilot started reviewing on behalf of zebreus January 14, 2026 16:51 View session

Start migrating tests from wasix-tests

e53752d

Copilot AI reviewed Jan 14, 2026

View reviewed changes

zebreus added 10 commits January 15, 2026 09:40

Run cargo fmt

13c6ad0

Add test util for running wasm with output

3225724

Add semaphore tests from wasix-tests

ccab5a3

Add include for C++ headers in the sysroot

48f9d3a

Add lifecycle tests from wasix-tests

e14593a

Add reflection tests

220bc53

Move exception handling tests from wasix-tests

61239aa

Add ffi tests

fd73c35

Add threadlocal tests from wasix-tests

fd815f7

Add module caching to run_test_with_result

ae37e3f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

WASIX test revamp #6055

WASIX test revamp #6055

Uh oh!

zebreus commented Jan 14, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 14, 2026

Uh oh!

Copilot AI Jan 14, 2026

Uh oh!

Copilot AI Jan 14, 2026

Uh oh!

Copilot AI Jan 14, 2026

Uh oh!

Copilot AI Jan 14, 2026

Uh oh!

Copilot AI Jan 14, 2026

Uh oh!

Copilot AI Jan 14, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		.env("WASIXCC_SYSROOT", "/home/lennart/.wasix-clang/wasix-sysroot")
		.env("WASIXCC_COMPILER_FLAGS", "-fPIC:-fwasm-exceptions:-Wl,-L/home/lennart/.wasix-clang/wasix-sysroot/usr/local/lib/wasm32-wasi:-I/home/lennart/.wasix-clang/wasix-sysroot/usr/local/include:-Wl,-mllvm,--wasm-enable-eh:-Wl,-mllvm,--wasm-enable-sjlj:-Wl,-mllvm,--wasm-use-legacy-eh=false:-Wl,-mllvm,--exception-model=wasm")

WASIX test revamp #6055

Are you sure you want to change the base?

WASIX test revamp #6055

Uh oh!

Conversation

zebreus commented Jan 14, 2026

Description

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants